Fixed usings, fixed System.Exception usage