Fixed minor regressions and build on the cluster

Change-Id: I8a25b80e79b1610b98f54685e62b4b27c476ff3d