Final tweaks for 0.4.0