More asset pipeline fixes