Fix the warnings