Style
Fix GC bug
Small GC improvements