No really need to audit/sanity check that frequently, other small tweaks