Fixed broken things from last commit