Make max shape sizes more liberal