Fix API modified functions