Trying to fix compiler errors under Hudson