Fixes to support persistent volumes