fixes for rebase branch