Fixed shock bugs