Correcting some missing vars