Fixes for IQueryables
Updated to use new walkies etc.