Some more fixes for asset embedding