Be more careful about combining paths for assets