Some fixes :P (again)