Code reading fixes.