Slew some bugs