merge screwup fixes