blue 2.0 upgrade fixes