Minor refactoring
Fix handling of multi-part put command