Fix a few of the undefined references