Minor fixes pushed.