FIX issues raised on code review