databasequeue fixes