Improved minor changes