First bugfixes.