Fixing some things I messed up during development.