Several small fixes, including xcaptcha form issue