Round 6 Extended

fixes for register services.