Shocking execution fixes