Fix z shell helpers