Update to fix some pause related issues