Minor fixes in state information inclusion