Got rid of most of the warnings.