More explosion optimisations