More return type corrections.