misc. production related fixes