fixes due to merge