Declare features used and fix API breakage