Last changes and fixes.