Fixed some warnings
Require geometry v6