Removed some warnings in all SA code.