CS Fixes for SQS work.