Fix a few build things up