Assets and DB tweaks