Bugfixes after restructuring.