Fixed bugs that I thought I already fixed.