some fixes for v2.3.2