warnings removed
Merge remote-tracking branch 'mikk22/warning_fixes' Fix warrnings