Small cleanups and doc fixes