First bugfix round