Some fixes :P