More impovements.
Still works only for larsoftaat FNAL.
Tested with checkout of lbnecode.