Fixed build issues under strict compilers.