Small tweaks on error propagation