Adjust commands to better match UNIX standard tools