Make some quick fixes.