Fixed build issues.
More progress towards tasky goodness.