Fix lcstate refactor issues