Extra related fixes.