Binary fixes