Additional model hot fixes