Fixes for the datafile delete functionality.