[FIX] PR comments fixes