Corrects some snafus