Gen IV: A bunch of fixes.