Revert to old Game Client + Bug fixes