libdisk: Cleanups and build fixes