Some fixes and breaks