More tweaks, but not yet fixed afaik.