Fix warnings
review comments