Minor fixes

Further control of memory