Fixing stuff I broke.