More warnings taken care of