Turned kludges into near-fixes