Tweakes to match what we're currently generating.