Final tweaks for 1.1