A few random fixes while developing cohort client