Some fixes :D