Further image optimisations