Fix some initial build issues