Minor changes to work with CuboidConnect 2.0