Minor changes regarding geometry API exports