Fix minor review comments