merge other fixes also