Memory tweeks (Thanks nAa)