Fix some stuff in the controler