Fixes to make branches compatible