first pass fixups