Fixed the stuff I broke last commit