Code changes

Some minor fixes.