Storage Manager proxy fixes.