Additional tweaks for #tccc17