fixes on DB