Some minor changes and fixes