fixes for v4.3