Fixed mroe compiler errors.