User memory fixes