Updates to 3.0.4