Config parsing fixes