Fixed some missing return statements.