[Refactor] Missing include for debug builds
[Refactor] Misc cleanup