Small post-merge fixes
Merge branch 'Fuwnayguy' into bigUpdate