Changes needed to compile fnalcore/master