Minor things

Hi Stuart,
Please review the changes below and merge when convenient.
Cheers,
Mihai.