Fixes to baseuri resolution++