Code review small fixes