Port some quick fixes.