Fixed the unary stuff to not return locations