Fixed Problems

Thanks Loren!