Minor changes to build from first run at 3.0.0 release