Bugfixes for correlated shocks

Uses preprocessing capabilities introduced in 07137e804b34a0e615398cb7cb5876f4a9027274

Fixes #392 and #494