+ Added more warnings