[Optimization]
Fixed known bugs.