Fix even more things