Changes for -RC2

Two breaks when building (AIX, Yocto) and a bow shape :)