Fixes for lookup