Bug fixes for integrated model