Made build compatible with ROOT-6