Changes/fixes for document specs