PIM-2515: Fix specs