Genconf fixes