Memory issues resolved