Fixes for branch3