Fixing stuff (I guess)