Attempting to fix wierd Jenkins failures...