Fix some missing return values