Fix issues with DataDroid