Further updates per -Weverything run