Set of bugfixes from cluster