Merge "Fixing some warnings" into jb-mr1-dev