Bug fixes from assembly.mak and stable version of tax_assign