changed some unsafe wrappers to static