mini fixes like in two DB branch