More suggested fixes.