First bugfixes