Polish the binary a bit