Fixes to remove warnings