Configuration parsing bug fixes