Fix up keywords