Branchbuilding fixes