Settings: fix build errors from recent cherry picks

Signed-off-by: travp624 <travp624@gmail.com>