Uri Service Fixes

All tested up and ready to go! Mind taking a quick peek for sanity?