minor fixes while working on 111