Fixing issues due to updrage to CloudML v2.0