Fixing more compiler errors.