fixes for review comments