Actually fixing stuff