Some small changes and fixes.