Tweaked some generation