Fix some doc and import ordering