Fixed minor issues with the last state manager commit.