Cleanup, fixup user prop sourcetypes and such