Config parsing tiny fixes