Minor problems after upgrading to 4.0