Code revew fixes