more fixes to move to asset pipeline