Configuration bug fixes