Fixing issues created by sync between the branches