PIM-3067: Fix specs