- Handful of fixes

Signed-off-by: Matthew Gladney <mgladney@MGLADNEYWIN7.viningsparks.local>