safe -> unsafe fixes