Fixes to get rid of warnings