Implemented compatibility shim assemblies, cleaned up some usings