Minor tweaks to the creation logic