Configuration update + few bug fixes