Fix some interface problems