Bugfixes for v1.5