Minor fixes

Done