Kadaster extension and fix