WP-2213 Changes in field lengths