Semantic fixes on base computation
Fix shim uri (thanks firefox for being so buggy)
Updated build