Additional tweaks to make things fit