Improves our code quality by fixing some warnings.