CONTENTBOX-381: Fixes with compat checks