FIX issues rasied in code review