Fixed client dependency in storage scanner.
Fixed other client/server issues in some messages.