More docs build fixes