Fixing some resource highlighting issues