Fixes for 4.0.0