Some interface compatibility fixes