Fix as per review suggestions.