Upgrade to oss .5.5