Fix some warnings -- Jeremy, please check