Fixes for unmatched captcha code