Corrected all warnings from Daniels review 6.