Fix minor interface issues