Updates for 4.0.4 release