fixes for rebased changes from master