Fixes for shock_decomposition