Fixing some things I messed up.