Minor tweaks to 1.1.5