removed some more warnings
Merge remote-tracking branch 'origin/temp_fixes' into temp_fixes