Fixed what I actually broke in the last two commits.