Fixing stuff I broke! Oops.