Small changes and GM doc