Fixy wixy some stuff