Fixes for real data treatment: save memory and time