select unit fixes