Fixed ResourceUri issues