Removed multiple warnings