some fixes caused by merging.