More fixes YAY!