More fixes than i thought