Fix bugs in SFCF zeroing and addressing