Fixes some interface annoyances