Dmitry pragueexpat fixes