fix some breaks