Final tweaks before 1.1.5