Doc and lint fixes