Fix some warnings from -O0 build