Fix block device mappings