Create a Compatibility namespace
Fixing minor bugs