Fixes: Integrated Drive fixes