Fixes for asset pipeline