Fixing stuff I broke