More 1.0.4 fixes