Added missing vars