Bugfixes - clean