Fixes to branch changes