Bugfixes

A simple run works.