Repairs to M306
additional changes to ZGrid25