Fixed more issues during merging