Fixed form related deprecated calls