Mo' and mo' fixes!