Minor fixes

Merge please.