minor fixes to non-prod stuff