Fix issues with early freeings
Completion is now working