Fixes in diskmanager