Fix some interface flaws