Extend docs code sample fixes