Some fixes, including local image assets