Some changes for using capistrano