Bugfixes. Release candidate