Fixing core issues with compliance lib...