More tweaks to make all the things work