misc merging fixes