Continuing on Form consistency improvements