Fix another using issue
Fix some comments