Fixed a few Mac issues and changed path attribute to uri.