Fix miscellaneous issues with registration and validation
Add servicebase if you're into that sort of thing