Fix compilation, gcc doesn't like use of the optional vars