some further changes to make us work well with newer RRDtool