[WIP] For review purposes only... Fix block device mappings