Misc changes.

Signed-off-by: Aaron Klapheck <aaronklapheck@gmail.com>