More fixes(?)