Minor fixes that to reflect changes in library