Clean up various warnings throughout.