Removed invalid using statement
Fixed some type issues