Fix some bad interface implementation since cleanup