Fixed some bubble scope bugs