Fixed Stage Issues