Fixed a few more uppercase uri-scheme related problems.