Deployment mode and inst var fix for some objects.