Trying to fix compilation errors under Hudson