More changes for 0.3.0 and 0.4- to both run.