Final tweaks for 0.25