Lab improvements to problems with find/inject