Fixes related to lookup