Fixing things I messed up.