Minor config gen updates