More fixes, sloppy me