Fix Upstream Merges

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>