fixes for review