More cleanup to make Fireplace work with compilation