3G fix & clean up