Update to fix issues