Asset fixes

Some small fixes for the switch to the asset pipeline.