Minor SA fixes

issues found while importing over www.