Trying a few changes from eos repos

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