Minor fixes

A couple of minor fixes please.