Fix geometry return and function type