Fixify more things