Fixes for review