Resolve ESOFORM issues