more branch fixes