Small bug fixes including form urls