DOC/BUG: Fix more problems