Fixing branch types