Last tweks and fixes