Bugfixes to ge21 geometry