Minor Fixes to remove warnings