[FIX] Interface Fixes