Minor fixes starting from Scratch

Issue-ID: AAF-698
Change-Id: Ie279c11f9f385e9cb179cbe3e16de35cbfa33ecf
Signed-off-by: Instrumental <jonathan.gathman@att.com>
10 files changed