Fix the warnings introduced