Fixing Tools - 2537 & CApp undeployment issue.