Add missing HFS checks