Numerous minor bug fixes<br />Fixes a critical registration issue when NOT using registration packages