Adds lo's fixes

courtesy pull request for breakfix