Update default max length values

Resolves #768