Fix the final errors, see previous commit