Fixed compilation bugs

Fucked up and pushed some bugs. Just fixed so we can compile. My bad!