boilerplate registration and selection fixes
0.0.21