v1.6.12. More fixes for handling block devices on startup.