Some improvements for config handling/loading