Minor fixes for claimed compatibility with 2.4 and 2.5 -- not to be "merged" into 0.9

in 0.9 we promise >= 2.6, thus these fixes are not needed.  Upon this one gets merged I will provide "merge" avoiding these into master (which is 0.9 now)