Some lint-y fixes

The changes to snuownd should probably be checked, but they appeared to be fine to me.