More quick fixes.