fixes for missing tokens