production related fixes