Two patches attached.

Thanks,
Nick