Further refinements to the compat module