PIM-2696: Fix specs