CSS-captcha fix
Fix backporting and fixing a spelling error
Some fixes to fixes, found via CQC
Misc small fixes