Resolve more insight issues