WP-2213 Changes to field lengths