Fixes, dupe fixes, upstrem pulls from @drtshock, fixes.