Bugfixes:

* Fix the migrations
* Add missing commits from previous release