Fix issues that broke doc build

Further doc style cleanup is on the todo list for now