More Register fixes

More registry references added, some references temporarily removed for
compilation sake. Build still broken (There were A LOT of compile
errors)