Fix specs + comments