Finished resolving issues that previously prevented compile