Fixes for code reviev