Memory and signal fix