Minor fix around system integration
Further updates from integration