More fixes that will be documented soon