Should fix remaining SRAM issues