Fix some of Jousway's shenanigans.