More #work tweaks