Final tweaks for 0.9.5