Fixes for release covering code review comments