Fix volume creation and editing; bleh