Fixed bugs related to timing and using polyglot
