FIX issues raised in code review