* more fixes for varying database providers