Fix a few issues from the weekly Valve-being-weird