#3 Several registration bugs