Some fixes :)