Code reivew fixes