Fix some specs according to the latest changes