Fixes #326
Fixing small issues due to changes on populate.sql