Some memory issues resolved