Additional tweaks and fixes