Fixes for the last state