Fixing some screw-ups