Minor improvements (2.0.6.314)