Fix some registry structures to match the Windows format.