Fixed some interface issues.