Add missing assets, code fixes