Fix Form Types