Testing: bugfixes to previous