Few fixes to match new DB setup