Binary and code size improvements