A little memory management changes etc