Some usings fixes