Fix small issues on DB