Added production minor fixes.