Improved minor errors