Fixed build issues that probably came from all of the merging.