Small tweaks to improve puzzle positioning