Fixed logic functions to be unitless