First bugfixes after testing