minor return bug fixes