Fix using statements