Some fixes (I guess)