Fixed Database self warnings