Fixed multiple issues for CloudSpokes challenge 2572