Fixed some interface issues