Fix build against latest Lunchbox/Collage, fix (some) cppcheck warnings