Minor fixes

Minor fixes to issues encountered while testing