Fixes on Local Spot-Check