Small Fixes from Backport

Signed-off-by: Salja <salja8840@gmail.com>