Simplify command lines to work with OSX