Some fixes to work better