Further fixes like #1377

Should have read the whole page before submitting the PR, I guess. ;)