Bugfix v2.3 issues

For testing...