Fixing various errors due to branches mixup