Latest batch of changes at work setup.