Adjusted field lengths. Fixes #45