Core/model: fixes related to model initialization