fix issues with fixed-length branch name assumptions