SMA App fixes commit #2

SMA App fixes commit #2