Fixed broken stuff from last commit. sorry