Fix specs for 4.0