Changes to move to 3.0.5 release