Work tweaks