Fix interface bugs