Minor code tweaks with assets research