Fixed issues per CR