Fixed more warnings
Merged WarningFixes into i173/160