Suggested fixes for 2830