- some minor fixes regarding Config