Tweak behaviour of memory driver and small update