Misc Fixes

+url fix