Various fixes while testing