Fixed errors and dirty indicators.
Fixed errors and dirty indicators.