Little changes towards less RAM usage