Update to fix bugs