Fixes for decoder solving.