Fixed issues with registration.
Merge branch 'hotfix/dynamicBinBugFixes'