Fix hole modification and more