More image optimisations