small fixes + common configuration