builddisks: Fix more