Removed ~12 warnings