Various asset include fixes