More image asset pipeline fixes