initial db population fixes

Signed-off-by: Joker-SMF <makerzzz.zzzz@gmail.com>