Beginning fixes for extended registers