Bug fixes while testing meek [see commit messages]