Fixes for Disk example