small memory footprint changes