Fix Some code from last commit