fix last two compilation warnings
Merge