Some missing return statements added