Some fixes while testing...