Some unvisible fixes.