Fix a couple of lookup bugs
Merge remote-tracking branch 'origin/dev' into dev