Fixed critical quality issues