Some of the final 1.0.4 changes.