Follow GEOMTK bugfix and make small changes