Fix functions that uses features