Fixes with thread-safe captcha