Bugfixes for version 1.3