add fixes after changing db