Make install more robust