Implementation fixes.