Fixed interface issues.