Few tiny changes and fixes.