Minor changes

Some minor changes and fixes.