Fixed and improved assure-suitable-size