Small cleanup, added more binary utils