Fixes and suggested fixes.