Fixing some bugs discovered after merge (shcema was not updated, views
were not up-to-date)