some missing fixes that are in master