fixes to handle PR branches