Fix some warning issues