Fix propagation errors