Fixing some stupid things re: Neil's changes

Yup.