Fix refactoring bugs
Send blank metadata event on ad complete for FreeWheel, fix refactoring bug