Cleanup and fix remaining issues from seaweedchan/4chan-x#212