Merge "Fixes to Flow Converter to make sure that we have proper defaults"