Cosmetic and workfile updates