Syn and discover improvements.