Some changes
Add DebugKit again