some additional patches