Fix Doc issues