Reanalyzing and fixing some buggy features.