Minor doc fixes, flatted imports