Fixed minor review comments