Bug Fixes (pause, critical also)