Magic

Plus a build fix for contentmodel.cpp.