Some fixes?