Bug fixes to new-style mkfs cmd