Got rid of the rest of the warnings.