Fixing more compile errors.