Fixing more things I broke....