Improvements to fnalcore deps