Minor fixes to stop warnings