Fix more bugs in doc build