[boxing optimization] Fixes after review