more unit fixes