Fixes for commit 92cef8b51a486da