Merging in other peoples fixes, and fixing obvious redhat bug (ie it doesn't work)