Fix a ton of warnings.  Pass the correct types to a few methods.