Production fixes from Jan-Feb