A few updates/fixes for work setup.