production minor fixes 1