Fix interface compatibility