Fixed as per code review suggestions.
Add FIXME reference.