FIX: More BIGINT Id fixes