Some minor changes and fixes again ...