Cleanup dat loading, fix version 8.6+