little fixes for diagnostics and conneg