Small fixes

This should get you back in a working state (and able to register new users on heroku). I'll send you a checkpointish bullet point for collaborators later tonight.