Cleaned up issues found at SGV user group