Some more updator fixes.