Decode stage bug fixes