Fixes for branch