Minor work updates/fixes.