Minor tweaks to fix inconsistencies discovered during production deployment