fixes for non-supplied values