Fix keyword handling