small tweaks to reduce binary size