fix other form issues