Fix issues that I only caused myself.