Two fixes so far

Pretty self explanatory. Still doesn't compile, but that's because of some undefined labels.