Update and fix amnesia support.