Resolved more compile errors.