Some fixes maybe