Fix specs & dependencies