[PATCH 0/3] Cleaned up some make validate errors and mapped some CCI's