Fix issues in user-guide