Update to fix issues noticed in class