Many fixes.