Fixed some bugs regarding rush application