Couple of tweaks to tidy up the binary processing