Getting closer to fixing the jdbc bugs