Fixed form related issues.