Minor bug fixes with disk_config stuffs