disk.cpp: misc changes