Added missing return statements in contructors