6 Commits (fixes/less-warnings)