Additional fixes.