Lookup tables: minor changes