Bugfixes for 19.1