Fix; add missing keywords