Fix the issues I forgot to patch in the last push.