more fixes for missing return value case