Removed 4 warnings