Additional tweaks to a4c7e83