Fix some warnings.
Merge branch 'master' into feature/fix_memory_issues