Minor fixes to remove warnings