Performance fixes.