Fixes a few brainfarts.