More fixing stuff