More Fixing Of Minor Errors