Fix keywords again